vulkan: Remove hacky function arguments

They're unused now that we removed the old render ops.

diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c
index 150d18b4e39fabbb865c7b6439f352db760a8b88..a8d0930614d92654a5aa8b8f90697e205d7f6250 100644 (file)
--- a/gsk/vulkan/gskvulkanblendmodeop.c
+++ b/gsk/vulkan/gskvulkanblendmodeop.c
@@ -36,9 +36,7 @@ static void
 gsk_vulkan_blend_mode_op_upload (GskVulkanOp           *op,
                                  GskVulkanRenderPass   *pass,
                                  GskVulkanRender       *render,
-                                 GskVulkanUploader     *uploader,
-                                 const graphene_rect_t *clip,
-                                 const graphene_vec2_t *scale)
+                                 GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c
index 8d84008c1206624c4d2c4a646990500259bf65e4..84cd66b97d1d7e072062fd0a198a1101dd7ecb7e 100644 (file)
--- a/gsk/vulkan/gskvulkanblurop.c
+++ b/gsk/vulkan/gskvulkanblurop.c
@@ -31,9 +31,7 @@ static void
 gsk_vulkan_blur_op_upload (GskVulkanOp           *op,
                            GskVulkanRenderPass   *pass,
                            GskVulkanRender       *render,
-                           GskVulkanUploader     *uploader,
-                           const graphene_rect_t *clip,
-                           const graphene_vec2_t *scale)
+                           GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c
index 2c1063a21add35e4483bb6935b8a688eb4a945de..9f1f3120968486338ffeef8942d7bc96729d27e5 100644 (file)
--- a/gsk/vulkan/gskvulkanborderop.c
+++ b/gsk/vulkan/gskvulkanborderop.c
@@ -28,9 +28,7 @@ static void
 gsk_vulkan_border_op_upload (GskVulkanOp           *op,
                              GskVulkanRenderPass   *pass,
                              GskVulkanRender       *render,
-                             GskVulkanUploader     *uploader,
-                             const graphene_rect_t *clip,
-                             const graphene_vec2_t *scale)
+                             GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c
index 35d12639dacd58d7f582bcd8f055205f77075fce..1e7972272ef96c3737e9b3294bedad140a1fbdee 100644 (file)
--- a/gsk/vulkan/gskvulkancolormatrixop.c
+++ b/gsk/vulkan/gskvulkancolormatrixop.c
@@ -32,9 +32,7 @@ static void
 gsk_vulkan_color_matrix_op_upload (GskVulkanOp           *op,
                                    GskVulkanRenderPass   *pass,
                                    GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader,
-                                   const graphene_rect_t *clip,
-                                   const graphene_vec2_t *scale)
+                                   GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkancolorop.c b/gsk/vulkan/gskvulkancolorop.c
index 77f7d4cda98cd2a07d8442348a74d9c75f5044e4..5dd4ecc608b9dd08df54d3fa49ce232dd6e14976 100644 (file)
--- a/gsk/vulkan/gskvulkancolorop.c
+++ b/gsk/vulkan/gskvulkancolorop.c
@@ -25,9 +25,7 @@ static void
 gsk_vulkan_color_op_upload (GskVulkanOp           *op,
                             GskVulkanRenderPass   *pass,
                             GskVulkanRender       *render,
-                            GskVulkanUploader     *uploader,
-                            const graphene_rect_t *clip,
-                            const graphene_vec2_t *scale)
+                            GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c
index 030da86dd82fbb78578f05ed43cfb6b06535985e..1967d13254ba81c47e17a902bbb8b62f9df9659e 100644 (file)
--- a/gsk/vulkan/gskvulkancrossfadeop.c
+++ b/gsk/vulkan/gskvulkancrossfadeop.c
@@ -36,9 +36,7 @@ static void
 gsk_vulkan_cross_fade_op_upload (GskVulkanOp           *op,
                                  GskVulkanRenderPass   *pass,
                                  GskVulkanRender       *render,
-                                 GskVulkanUploader     *uploader,
-                                 const graphene_rect_t *clip,
-                                 const graphene_vec2_t *scale)
+                                 GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c
index 323ee994141575dc5ffacadf6c284ce60ae28b3b..78958852eb31f53a5e348838b9b85575f2437346 100644 (file)
--- a/gsk/vulkan/gskvulkaninsetshadowop.c
+++ b/gsk/vulkan/gskvulkaninsetshadowop.c
@@ -30,9 +30,7 @@ static void
 gsk_vulkan_inset_shadow_op_upload (GskVulkanOp           *op,
                                    GskVulkanRenderPass   *pass,
                                    GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader,
-                                   const graphene_rect_t *clip,
-                                   const graphene_vec2_t *scale)
+                                   GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c
index f3275cb5d2cdad68a664ca3e810289ce92ef73c7..22aca436147f6b916ee596e3aa6f2434df717d02 100644 (file)
--- a/gsk/vulkan/gskvulkanlineargradientop.c
+++ b/gsk/vulkan/gskvulkanlineargradientop.c
@@ -33,9 +33,7 @@ static void
 gsk_vulkan_linear_gradient_op_upload (GskVulkanOp           *op,
                                       GskVulkanRenderPass   *pass,
                                       GskVulkanRender       *render,
-                                      GskVulkanUploader     *uploader,
-                                      const graphene_rect_t *clip,
-                                      const graphene_vec2_t *scale)
+                                      GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanoffscreenop.c b/gsk/vulkan/gskvulkanoffscreenop.c
index 7745b57387f00c6fb77ffb052f991651fddb1b1e..079f164c059aba14f32f12ae5a00df80b654c73e 100644 (file)
--- a/gsk/vulkan/gskvulkanoffscreenop.c
+++ b/gsk/vulkan/gskvulkanoffscreenop.c
@@ -29,9 +29,7 @@ static void
 gsk_vulkan_offscreen_op_upload (GskVulkanOp           *op,
                                 GskVulkanRenderPass   *pass,
                                 GskVulkanRender       *render,
-                                GskVulkanUploader     *uploader,
-                                const graphene_rect_t *clip,
-                                const graphene_vec2_t *scale)
+                                GskVulkanUploader     *uploader)
 {
   GskVulkanOffscreenOp *self = (GskVulkanOffscreenOp *) op;
 

diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c
index a8e304d13ff053356aea3fa9d9e6ced918f31bfe..e626ba51494feef34cb3b1d033afc2b06abfaf5b 100644 (file)
--- a/gsk/vulkan/gskvulkanop.c
+++ b/gsk/vulkan/gskvulkanop.c
@@ -22,14 +22,12 @@ gsk_vulkan_op_finish (GskVulkanOp *op)
 }
 
 void
-gsk_vulkan_op_upload (GskVulkanOp           *op,
-                      GskVulkanRenderPass   *pass,
-                      GskVulkanRender       *render,
-                      GskVulkanUploader     *uploader,
-                      const graphene_rect_t *clip,
-                      const graphene_vec2_t *scale)
+gsk_vulkan_op_upload (GskVulkanOp         *op,
+                      GskVulkanRenderPass *pass,
+                      GskVulkanRender     *render,
+                      GskVulkanUploader   *uploader)
 {
-  op->op_class->upload (op, pass, render, uploader, clip, scale);
+  op->op_class->upload (op, pass, render, uploader);
 }
 
 gsize

diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h
index 2b7c88a16de5464f1e8bf5a70d26f3392cefee31..8e8bf8e52fa27b83938f8fb73914626e9f7e1ff6 100644 (file)
--- a/gsk/vulkan/gskvulkanopprivate.h
+++ b/gsk/vulkan/gskvulkanopprivate.h
@@ -28,9 +28,7 @@ struct _GskVulkanOpClass
   void                  (* upload)                                      (GskVulkanOp            *op,
                                                                          GskVulkanRenderPass    *pass,
                                                                          GskVulkanRender        *render,
-                                                                         GskVulkanUploader      *uploader,
-                                                                         const graphene_rect_t  *clip,
-                                                                         const graphene_vec2_t  *scale);
+                                                                         GskVulkanUploader      *uploader);
   gsize                 (* count_vertex_data)                           (GskVulkanOp            *op,
                                                                          gsize                   n_bytes);
   void                  (* collect_vertex_data)                         (GskVulkanOp            *op,
@@ -56,9 +54,7 @@ void                    gsk_vulkan_op_finish                            (GskVulk
 void                    gsk_vulkan_op_upload                            (GskVulkanOp            *op,
                                                                          GskVulkanRenderPass    *pass,
                                                                          GskVulkanRender        *render,
-                                                                         GskVulkanUploader      *uploader,
-                                                                         const graphene_rect_t  *clip,
-                                                                         const graphene_vec2_t  *scale);
+                                                                         GskVulkanUploader      *uploader);
 gsize                   gsk_vulkan_op_count_vertex_data                 (GskVulkanOp            *op,
                                                                          gsize                   n_bytes);
 void                    gsk_vulkan_op_collect_vertex_data               (GskVulkanOp            *op,

diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c
index 7610bce039dd4337edb08b1c31e6a93f2cc43011..95ac7e38364fc62c4139502539559a25b0211ebf 100644 (file)
--- a/gsk/vulkan/gskvulkanoutsetshadowop.c
+++ b/gsk/vulkan/gskvulkanoutsetshadowop.c
@@ -30,9 +30,7 @@ static void
 gsk_vulkan_outset_shadow_op_upload (GskVulkanOp           *op,
                                     GskVulkanRenderPass   *pass,
                                     GskVulkanRender       *render,
-                                    GskVulkanUploader     *uploader,
-                                    const graphene_rect_t *clip,
-                                    const graphene_vec2_t *scale)
+                                    GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 520e42d8559421206110f1bec59eb2ffbec15b10..b4989ec6a0bc46829894a0ea6ec0c7d55a57b397 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -1424,21 +1424,12 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass  *self,
 {
   GskVulkanOp *op;
   guint i;
-  const graphene_rect_t *clip = NULL;
-  const graphene_vec2_t *scale = NULL;
 
   for (i = 0; i < gsk_vulkan_render_ops_get_size (&self->render_ops); i += op->op_class->size)
     {
       op = (GskVulkanOp *) gsk_vulkan_render_ops_index (&self->render_ops, i);
 
-      gsk_vulkan_op_upload (op, self, render, uploader, clip, scale);
-
-      if (((GskVulkanOpAny *) op)->type == GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS)
-        {
-          GskVulkanOpPushConstants *constants = (GskVulkanOpPushConstants *) op;
-          clip = &constants->clip.bounds;
-          scale = &constants->scale;
-        }
+      gsk_vulkan_op_upload (op, self, render, uploader);
     }
 }
 
@@ -1446,9 +1437,7 @@ static void
 gsk_vulkan_render_op_upload (GskVulkanOp           *op_,
                              GskVulkanRenderPass   *self,
                              GskVulkanRender       *render,
-                             GskVulkanUploader     *uploader,
-                             const graphene_rect_t *clip,
-                             const graphene_vec2_t *scale)
+                             GskVulkanUploader     *uploader)
 {
   GskVulkanOpAll *op = (GskVulkanOpAll *) op_;
 

diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c
index 468a154050fc441e922bc7e7ff8e2b0ea7fd722a..e684aadd646c638638e3d4ec086de781cd51a6f2 100644 (file)
--- a/gsk/vulkan/gskvulkanscissorop.c
+++ b/gsk/vulkan/gskvulkanscissorop.c
@@ -20,9 +20,7 @@ static void
 gsk_vulkan_scissor_op_upload (GskVulkanOp           *op,
                               GskVulkanRenderPass   *pass,
                               GskVulkanRender       *render,
-                              GskVulkanUploader     *uploader,
-                              const graphene_rect_t *clip,
-                              const graphene_vec2_t *scale)
+                              GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c
index 45156918d800fcc9eba2659e680ae4a1965d44b0..972f69250202637bdedd5c8d95dd9a67b07e57b4 100644 (file)
--- a/gsk/vulkan/gskvulkantextureop.c
+++ b/gsk/vulkan/gskvulkantextureop.c
@@ -31,9 +31,7 @@ static void
 gsk_vulkan_texture_op_upload (GskVulkanOp           *op,
                               GskVulkanRenderPass   *pass,
                               GskVulkanRender       *render,
-                              GskVulkanUploader     *uploader,
-                              const graphene_rect_t *clip,
-                              const graphene_vec2_t *scale)
+                              GskVulkanUploader     *uploader)
 {
 }
 

diff --git a/gsk/vulkan/gskvulkanuploadcairoop.c b/gsk/vulkan/gskvulkanuploadcairoop.c
index 29965660d0a4a69dbf70818fc7f7591391ffe53a..dc621982b075bd655fb210c394ea6c7fd19f1cf6 100644 (file)
--- a/gsk/vulkan/gskvulkanuploadcairoop.c
+++ b/gsk/vulkan/gskvulkanuploadcairoop.c
@@ -26,9 +26,7 @@ static void
 gsk_vulkan_upload_cairo_op_upload (GskVulkanOp           *op,
                                    GskVulkanRenderPass   *pass,
                                    GskVulkanRender       *render,
-                                   GskVulkanUploader     *uploader,
-                                   const graphene_rect_t *clip,
-                                   const graphene_vec2_t *scale)
+                                   GskVulkanUploader     *uploader)
 {
   GskVulkanUploadCairoOp *self = (GskVulkanUploadCairoOp *) op;
   GskVulkanImageMap map;

diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c
index ebe997b1ad929beec46ae78e566f3492f7e1d5b3..a8d7540506b51c79519f31cc27f6b8dbe7d73800 100644 (file)
--- a/gsk/vulkan/gskvulkanuploadop.c
+++ b/gsk/vulkan/gskvulkanuploadop.c
@@ -25,9 +25,7 @@ static void
 gsk_vulkan_upload_op_upload (GskVulkanOp           *op,
                              GskVulkanRenderPass   *pass,
                              GskVulkanRender       *render,
-                             GskVulkanUploader     *uploader,
-                             const graphene_rect_t *clip,
-                             const graphene_vec2_t *scale)
+                             GskVulkanUploader     *uploader)
 {
   GskVulkanUploadOp *self = (GskVulkanUploadOp *) op;
   GdkTextureDownloader *downloader;